Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2011 07:56:38 +0000 (00:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2011 07:56:38 +0000 (00:56 -0700)
commitda8b0d6ce0d12c888868b72069b992109487d189
tree88a146d084c61065dfa560583a8c4ef6ef15518e
parent207421c0af4edf88943e270ad4bc83934cabcc04
parent25dd6ecd110bcca32647aacbf53c09956044022d
Merge from mainline.